appDisplay: Remove scroll view hack in FrequentView

The frequent view should not be scrolled, but to work around the
icon grid overflowing, we used a (non-scrolling) scroll view anyway.
Now that IconGrid:fillParent allows us to avoid overflow, we can
remove this hack.

https://bugzilla.gnome.org/show_bug.cgi?id=694256

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 2f1a9f7e94695f9844d60aa331ca9b8bb86ebabf..4e10623a0a1d99b2adc93aae96d6aebdbecfb510 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -860,11 +860,6 @@ StScrollBar StButton#vhandle:active {
     padding: 4px 16px;
 }
 
-StScrollView.frequent-apps StScrollBar {
-    min-width: 0px;
-    width: 0px;
-}
-
 .app-folder-icon {
     padding: 5px;
 }

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 4ee94cf4ad196ab356eb37f0b75cb0a1c3bfe3c8..e34955ad72dd666522ce5da3bdf7ac26e7c6e010 100644 (file)
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -298,23 +298,11 @@ const FrequentView = new Lang.Class({
 
     _init: function() {
         this._grid = new IconGrid.IconGrid({ xAlign: St.Align.MIDDLE,
+                                             fillParent: true,
                                              columnLimit: MAX_COLUMNS });
-        let box = new St.BoxLayout({ vertical: true });
-        box.add(this._grid.actor);
-
-        // HACK: IconGrid currently lacks API to only display items that match
-        // the allocation, so rather than clipping away eventual overflow, we
-        // use an unscrollable ScrollView with hidden scrollbars to nicely
-        // fade out cut off items
-        this.actor = new St.ScrollView({ x_fill: true,
-                                         y_fill: false,
-                                         y_align: St.Align.START,
-                                         x_expand: true,
-                                         y_expand: true,
-                                         reactive: false,
-                                         style_class: 'frequent-apps vfade' });
-        this.actor.add_actor(box);
-        this.actor.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+        this.actor = new St.Widget({ style_class: 'frequent-apps',
+                                     x_expand: true, y_expand: true });
+        this.actor.add_actor(this._grid.actor);
 
         this._usage = Shell.AppUsage.get_default();
     },